restructure for final presentation