Changed headers to be more appropriate