change to non static