Updated for new version of forge