More work on built-in controls