Updated limit. Should move to config