Updates after feedback #1 on this branch