new version, updated vars and more