Updated the code even more