minor changes after meeting with nico