minor adapt 2