added more user control