Changed to public static vars