Minor changes for casual experiments