Committed the right JS file this time. This one includes the refactored code.