Updated header stuff again