Modified the interface for end user.