Switch to more basic shapes