Updated with new libs