need to fix source selection