Small simplification. Still poor performance