Gn gwtp 59

no need to be public. Package private should be enough.