08-12-2013 Updated for ORM