3rd ER Definition

Changes made based on spec 4.