Updated non-text to be less redundant.