Major Updates to doug's structure