Updated for convention
Updated entry_point