Now with controls