Modified the use-case