modified for new forge release