first set of changes to address #3