Chapter10 functionalities updated