Sounds sensible - I'll commit this now