fixed everthing