merged the controllers