Mike's Changes after Merge