updated controllers and join