implement features to address issue 131