controller deprecated: I left it in at the moment to let @WGierke understand what I changed, so that he can continue next week.