committing wip 2.3 changes