Jade update

Re-submit of jade update.