Jay's changes