remove unecessary contain
add support for primary=0