Modifying lib for fandist