merge Jan's changes