brendan changes (fix offsets later)