Ch. 5 and other related modifications