even better current master detection