New chai-less version