took out optimization option
accounting for if else functions
Merge branch 'master' of https://github.com/offDaCharts/min