Updated after review from Rob.