now always compute everywhere (no longer a user option); further improved performance