#92 trap logs updated
#119 #92