Completed 6.2.4