More changes

Shaping and adding