Changes after Julian comments