work on better selection behavior