Some adjustments in 'hardware' component