added some traps :)