some changes to spped up execution