merging yavta additions and lower target selection