merged into one controller