evanriot - had to fix some stuff