several changes
reorganizing
reorganizing
namcap check