updated for structure changes