Updated to work on lab machines