revised a bunch of headers for simplicity