Add offset subtract code
merge