Last changes before sending to Jarvis.