Better detecion and check sites