Improve performance, add hit-the-wall callback