Bad merge, sorry! Putting KC's logic back (#50)