Fixing all of the BUGS!
TEST