Updates after feedback #2