Added more computer smarts