Adding our CSIT + Verify + fixing macro