new branch
new interface
fixed merge issues