Extra changes (12/18)

Extra changes