added pop up stuff