Merged Arun's changes (as of today)