Fixed functionalities.