changed some stuff, lets see if this is better