finish commit 22 oct