small progress on #136