Improved "run" option - nearly perfect