full commit 2/18 6