Better slot handling