New save code simplified - thx xylographe  :)