Finalization of 1.6