Huge upgrade to CanCan 2.0