some changes by erez