some coffeescript added