added limits and logs