Nice idea with single line overrides - I'll do that.