fixing interfaces