Version i send to Stefan and the others. Waiting for feedback