Gordon most definitely. I think he was beefed up to not be such a total loser in DoS. Gilbert still just sits there.... playing his harp in a town of beautiful women....wearing purple.