New offset system

Fixed the new offset system so it works fine now.