v1.7 finalization