Page handler working better