Code Rewrite
Updated Jasmine