Added a couple of limits