More suitcase changes