Required update to work with latest version of IPAS

Adjustments in passing of the shields, to comply with "old" and "new" shields