forgot to add these back in. Couldn't find which header they came from originally