Commit final 3/05/2015