Integrate Reed's changes