I thought we got rid of this controller/pattern ?