fixing entry point