Updated register addresses, now uses offsets