Now working. Still slow