08-12-2013 4:50PM PDT - Updated for modified ORM