Change logic surrounding run