redesign to work with plain text