Add :ud, factor get into own function