expected_runtime is now cached -> much faster
Organizational stuff