SBH: merge Original project updates