Changing the Until Logic