tweaked numbers
merged previous two commits