Nap lasted half an hour. The other issue; when we deviate from his own little routine it ends up being worse than the original. -.-;