Modified the interfaces...