changed solution to popup