Completion of 2.4