minor changes (not done!)