more controller modifications