There are still things wrong with the code