added little changes to be less wrong