Change stuff and make it better