changes made originally by Ravi