update libs
Merge branch 'rearrange' into MkIII
Merge branch 'MkIII'