making more generic again