Fix boilerplate code
Completed OPT Strategy