Editing based on discussions with Andrej