Some changes with Pages logic.