Lisa and Juhi's changes