Jai's changes