Updated to newest lib