FINALLY ALL FIXED <3