Jas's changes