Package Scope Optimize #2