incoporate hannah's feedback about order & headers