Toolkit checker part 2