reconfigured to use only one static class