merged controllers
updated refs