jai's changes
modified
first commit