More work on wes comments.