first phase - final commit