New: [ task #1005 ] Improves and best adaptations