Feature/system efficiency

Collapse these 2 lets into one?