finalized version for new hardware