improve for Quickrun