Improvements
Updated header