added methods from Forge PR