Partial refactoring of Slots orientation