Move around code so messages display in correct order