Changes for issue 74