FOR-59 : more improvements.