another libs rearrangement