Interfaces

some changes