Changed traces slightly