On second though, changing some stuff