Updates some things but still not working correctly