Minor changes to EntryPoint
Prep for Merge to Master