Added capacity to handle issues with input boundaries

2 jobs for master in 2 minutes and 28 seconds