Changed to better function for concentration + optimized