Merging with js-assessment base