Updating to latest libraries (untested)