Removing need for 'run' command