Some eddie changes