fix for Dajung
page 22 wbs
merge conflicts