Traps now fully work