Refactored to gradely from hwdb