working on popup
moved method
replaced page