Some number tweaking
More number tweaking