edited interface
merge