Working on AISTATS version