Libs added, more changes