commit 24/6-2