changed some stuff. Take a look at it again!