just trying to merge in ctr+c bugfix

sdfhsdgh