Prepping for 1406 usage