Slightly simplified and more correct scaling controls