changed some traces to be shorter