CVAE : modifications