Modified some things but not working correctly