Updated for new computer