Last Update to add Eddy Changes

Last Update before switching to main branch just for comparison reasons.