Revert "Revert "most recent commit while working with Maria and Andrew""

This reverts commit d34cb39de6d8587b8c312daf2ed6b993ba876dd0.
Revert 580fb99..c674738

This rolls back to commit 580fb997b7e496bf89096e67acc22177ffbed80f.