Merge Eddie's redisign