renamed 2 methods and made them static