recommit : plan to fix some stuffs after all these years