Still working on second trap type