Updated with STVector