added changes by Meir