added doga's corrections