Some changes for NewPage