Prep work for mx version