Addressed comments from Stephen Horlander