Update HarveyLab code with Selmaan's changes