High-level methods use new mid-level interface, updated header
Marked short methods inline