finished revision of 2.4