removed popup and bugfixing