Changes from Original Author