Final fix

Totally working now