add 2i support