added some more functionalities