moved static variables to options