Just popping in - as you know I've tried short am, long pm to death
![Roll Eyes ::)](https://smiley.babywhispererforums.com/Smileys/classic/rolleyes.gif)
I agree with Fleur about OT overall, though the 40 minute wakings could be UT or OT. I would try pushing the second nap a touch later as Fleur suggested - if that makes things worse, not better then you could always bring it earlier or go back to a longer first nap. If LO has recently started moving more (common around this age) then he may well need more sleep than previously.
FWIW although I was fairly convinced my DS was an 11h night type of guy, I'm actually coming round to thinking those are OT nights here. At least, he never seems really fully refreshed by them and would be tired and whining in the mornings especially.