changes to address comments from @teravest