Put things in working order

Nothing would actually work without these crucial additions