Working in square mode; circle functionality remains