Working version with interface changes

according to new design