final,madigan6: fixed naming