more detailed updates and closed #39