Added Dunn's latest changes