Added eddie and slight changes