Finish structure changes with textarea
after ariana merge