updated with part 2 jasmine