Added extra shapes