changed some stuff for learning