WIP changes (adjustment to dp2)