Updated for Dark-Library