Complexity hastle

Switch to explicit calls