updated structure-functionn analysis