Added more user control