He woke at 830 so I pushed nap out from 1230 to 1 and he slept until 230 and was asleep by 745. And he woke today at 7 regular time napped from 1230-230 which is long for him and was in bed by 730. I tweaked naptine but kept bedtime the same and he was fine and back on track today. It seems like one day with a nap in the car can really mess up the next day. But now that he's older he snaps back quicker to routine. He still wakes up crying and cranky after his naps though. But not so much when he does a long 2 hr nap he wakes happy. He did wake 30 mins into nap today crying but resettled. I've noticed lately though that he bangs his head on the mattress when he's trying to fall back asleep which is pretty disturbing.
