some changes after meeting with gandrud