Feature/system efficiency

any reason to loose the (round) call?