Popup disable
Merge branch 'chalenge'