Extension #1 with Entry Point

Modified