added ShouldReturn