added aa_social and aa_wysiwyg