[master] Added stop and strategy selection