some of Adita's updates