revert back to Raghu's code