added content while in dbj_branch_1
comiting merge from dbj branch 1