Made changes to standard run to stop deadlock