Move setup to control/update