Fixed up to use latest library