Adding history; removing commented code; revising offset update