Order emails update 2