added DBC's changes at begin week 8