Added new until methods