improving entry point