Further modifications to offset values