refactored shapes to remove orientations