Changes for new window event