more sources and selec logic