Jamesh's changes