Added tolerance box support, no error handling