Improve capturer