[D853] Code updates to new layout and logic.