save refactor
added popups