Modified wrap and run
Merged