corrected selection flow and events