update -- still need to check text et al