includes all corrections from Yehuda and Stefan