Continuing work on controllers