Moved methods around to make diffing with the previous version easier