cleaned up, water removed from this project(will go in an other one)