Functionality updated