#1 fixes, changing methods