Complete conversion to Jade