switch back to moment method, minor fixes for efficiency