add popup
some changes