Updated cgoswami