Review comments by Julien addressed :)