catch up with the latest library refactoring