new version, splittet logic and template