BASOP additions and instrumention code additions