Added Traps (not fully working)