More changes. Should start use git properly )