Changed stuff towards library.