Prepping for 1.8