properly handle all VCS requirements