Upgraded forge again