Jade edit 3-17