Change run path values
Remove early return statement