improved management functions