splitting inspecting and handling into two steps