Reverting some changes to study pop/dce draft view