code removed from dev_nitin