Update to remove textarea dependence