What I have changed is putting him to bed during the day after 1.5 hrs of awake time without fail. He always goes off to sleep. He has a mobile over his cot and he watched that and drifts off. If I see him showing tiered signs then for him he is over tired. That's working well for us at the moment. But who knows what the future holds! Xo