refactored default library to be proper