minor changes so that we don't "wait"