Added Shape and Wall