partial refactor of slots.