functionalities fixed