LSDMap 2.0: second commit