Updated selection mechanism