finalized 4/14 iteration