refactoring due to library change