before variant / track refactor