Updated Single mode