Fix bugs & Add another vc