merge Tamir's changes