This should be static I guess

Shouldn' t break anything though.