Finish 1.6.0