Added libraries (Rik's work)
Added libraries (rik's changes)