should be working now (initial limit fixed to 20)