More tool feature work