Roop's changes
more changes