full functionalities added for v1.0