In addition to moving this function, I added this behavior.