Added optional popups