Omitted scrub call (needs more work)