Updated to use 1.0.1e headers