shapes
fix stack overflow issues