Updated to latest library