Functionality Updated