Mj improve verification

add fork / join logic