Updated to keep the offset on the first page