checkpoint commit. This includes changes to make it work with latest rust version