Added a limit argument to help with manual testing

Change-Id: I61017c61b40383d7d5688199b6bfe9ecbaa27d9a