update code to be consistance on all the static methods