Merged Jordan changes