Another attempt, still  too slow #164