Switched to new fireform