Numerous modifications for first check-in