Initial changes for reduced alphabet (incomplete)