Committing most recent work
Optimiazations performed