Added all shapes