working on popUps
merge commit