edition: more handling for training