[SQUASH ME] encapsulated the complete header