Rework the OPT loading so that it works on all the models that I can find :)