fa3dcb0 update per new structure