added some lines missing from last merge