Changed headers to be less redundant.