Adding selection mechanism!