updates to reoganize