Enter some changes

-needs debugging