Modified weiwei's change