Added TODO, changed output range