v31

Added defensive mode