Reworked interface