Added shape
Added some translation