more prepping for Defect 08,09