I have created a video showing how to be able to have both stop with return and stop without return at the same time.