Actually handling the correct headers