Updated to static and renamed.