added conditions for running the jiffy client