Reverted errors in feature matrix construction to Laura's Vrs