Modify implementation