Bugfix, return incorrect inputs, and shorter variable names.