Swapped shapes to use objects