merge with Stefan's changes