update to clean controller setup