Final commit from gamecraft.