Added small stuff from work laptop