Adapted to the latest roll table changes.