merging
pop up code added