dont using static class now
forgot to change version