Updated to newest libraries