Extra changes (8/18)

Extra changes