Better messages and a tiny nap