Make conditional changes as suggested by Charlie