Change square to X in some places