added non-varibright support