Scaling better and with limit