improved a heavy method call from everything