FIXES ALL THE BUGS