Working local version with updated RunCommand