page handler changes