Adjusted some numbers (not even close to done)