updated from personal laptop