Final version before sending to ned