initial set of enhancements after fork