switched to a static class implemementation