switch to using jafja