Part 2 tools images
Fixes