I think this is what you wanted (also again some other minor improvements) Credits to Griffpatch for the numbers.
