- adding popup
- adding constants
- renaming