Final shaping

Comment on this