Improvements and Headers