little improvement on the interfaces