reorganized some regions and method names