Improved strategy + use of RSP 3.2
Merge