discovery and final commit