commit 23-5-14 part 2