Changes from CliffordAnderson Repository