Last changes by Shay from Inbar's laptop