Better library logic