added wysiwyg and functional