Updated constructor and calls to offset