Added more trace stmts