Added 3 shapes