Much better, next step handle selection events