Added Two callbacks and uptade Pages