updating to paras's version