commit 12
commit 12 + merge with 5,2? not 6?