changed VCs and updated classes