Change VAE framework design