reformat according to david spec