updated temp secret key
merge conflict
Header work