rework on jasmine