Hunting bugs
Fixing slot factory