Changed event window order