Updated for VCSA check