new design, working controllers