Combined Naveen's and Janet's Changes