Minor edits and a little more risk analysis