Eddy's changes