Refactored slots a bit