removed popup
fixed timestamp