updates --> mostly by Ori