Before merging controllers