updated with case and pivot