some structural enhancements