Modify the functionality