Works for all shape types now