switched support to any base as long as you switch a private static fina...

...l constant up top