added 1.pages 2.Cash 3.little refac