Changed to more user-friendly parameters