Updated process based on our experiences over the last couple of months