fixed to pull from cm-12 revisions and lp5.0