not re-run ud + fixes