Added a selection mechanism