Merge "Modify code because of interface"