re-integrate libby arrow pos changes