FIXED IT FINALLY