Changed references from *static* to *public*