changed some stuff for critique