updated wrapper with criticalproperties function..