Updated to current libs