addingKatja's changes
comming katja's changes