Last performance fix for the day.
Merge branch 'test' of github.com:kellyelton/OCTGN into test