Slightly simplify loading