Feature/system efficiency