Some more work for circley controls