Fix/now 360

i'll make it simpler though