moved limit into a configurable setting