more performance improvement on unit runner