Added option to force X and force Z