Updated header and removed version