fixed interface. Small changes.