Updated control app