initial patch 106 commit