added rest of shapes