Modified the entry point