Update due to Scout changes