changes in light of @kuenishi comments