Fork to aldnin with new libraries