code reorganization caused by last update