Actually added change promised in last commit. Values still need tweaking!