Added checks for HW