Breadcrumbs added, PIDs improved