re-adding genericity