Interface reworked

nothing special there