Changed some more SIMON ! ! !