Updated to be static