Upgraded to 2.5, Hack for references, added insight