Working version with Runner.