Functionality update

Updated functionality