change structure and globalize procedures