Basically forking the legacy code