Updated  functionalities