Initial Checkin with minimum GFI changes