More conversion to jade