Re-syncing my changes

Same changes as prior commit.