Final Offset Changes

All Offset Changes should be complete