Updates for Wednesday!

Pulling in Dav's Fix