Revises orphan checking functionality