Address some of @elmart's comments.