Updated 2 methods to be static