Modified some stuff, stumped right now