Cleaned up HW