Updated to the latest libraries