Changed static-ness of things