commit final 10/07