Skillplan: Add condition to save best remap