some restructuring and additions.