new bases code structure and comments