Add a better selection statement