updated to track some machine information