Adding the changes that DBC requested