Add ability to select on the fly