fixed guthrie's terrible changes