Updated code for ICLR submission
