Updates after feedback #1