Extra changes (6/18)

Extra changes