Upgrading methods to include public and static