Changed BPE to make it run faster