updated to address issue 17