Better checks implementation