addressed part 1 of #95