changed some statements :)