Updated with some minor 'EOM' comments.