FIXED ALL THE BUGS