added multiword support