improving the interfaces
minor changes