Further improvements to capturer