Added Run and Step functionality