Static now should be removed