Inbar's vesrion of the core files