Changes for Code Review #37