Moving these here seems like a reasonable idea