Updated the functionalitites