aracely's changes

merge them fool