small structural changes and enhancements