One more try at minor changes