added interface
fixed conflicts