removed public and static