Updates after feedback #3