more work on into popup