changed all traps like rl