Changed to non static initialization