adds support for  in addition to  and