Modification

Modify some functionalities