updated controllers and variables