Updated JS and Coffeescript